From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Fri, 17 Jan 2025 14:02:29 +0000 (+0100)
Subject: while migrating from another version, clean updater config
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~69^2~5
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=b3886ed1b6e5271e0e1ab49b467bc7fc31c61b42;p=nextcloud-desktop.git

while migrating from another version, clean updater config

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 4175ae5f0..10bf7cfaa 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -143,6 +143,10 @@ bool Application::configVersionMigration()
     const auto versionChanged = previousVersion != currentVersion;
     const auto downgrading = previousVersion > currentVersion;
 
+    if (versionChanged) {
+        configFile.cleanUpdaterConfiguration();
+    }
+
     if (!versionChanged && !(!deleteKeys.isEmpty() || (!ignoreKeys.isEmpty() && versionChanged))) {
         return true;
     }
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 37ea14d6f..93e9f2cbf 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -453,6 +453,17 @@ QString ConfigFile::excludeFileFromSystem()
     return fi.absoluteFilePath();
 }
 
+void OCC::ConfigFile::cleanUpdaterConfiguration()
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    settings.beginGroup("Updater");
+    settings.remove("autoUpdateAttempted");
+    settings.remove("updateTargetVersion");
+    settings.remove("updateTargetVersionString");
+    settings.remove("updateAvailable");
+    settings.sync();
+}
+
 QString ConfigFile::backup(const QString &fileName) const
 {
     const QString baseFilePath = configPath() + fileName;
diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
index 844036336..f38fba1f1 100644
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -48,6 +48,8 @@ public:
     [[nodiscard]] QString excludeFile(Scope scope) const;
     static QString excludeFileFromSystem(); // doesn't access config dir
 
+    void cleanUpdaterConfiguration();
+
     /**
      * Creates a backup of any given fileName in the config folder
      *